Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[develop] Update ufs-weather-model hash and further clean the machines tested in PULL_REQUEST_TEMPLATE #1096

Merged
merged 15 commits into from
Aug 12, 2024
Merged

[develop] Update ufs-weather-model hash and further clean the machines tested in PULL_REQUEST_TEMPLATE #1096

merged 15 commits into from
Aug 12, 2024

Conversation

MichaelLueken
Copy link
Collaborator

@MichaelLueken MichaelLueken commented Jun 14, 2024 •
edited
Loading

DESCRIPTION OF CHANGES:

  • Update ufs-weather-model hash to b5a1976 (July 30)
  • Add hera.gnu, remove cheyenne.intel, cheyenne.gnu, and gaeac5.intel, and alphabetize the machines in the TESTS CONDUCTED section of the PULL_REQUEST_TEMPLATE
  • Correct behavior of Jenkins Functional WorkflowTaskTests. Currently, TASK_DEPTH is set to null, resulting in no tests being run during the Functional WorkflowTaskTests stage. Replaced env with params in Jenkinsfile for setting TASK_DEPTH. Testing shows that this will correctly set TASK_DEPTH to the default value of 9 and allow the tests to run.
  • Removed extraneous entries from the verification scripts to remove KeyError messages in the associated verification log files.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

TESTS CONDUCTED:

  • derecho.intel - Fundamental tests and AQM sample config (ush/config.aqm.yaml) were run
  • gaea.intel - Fundamental and Comprehensive tests were run
  • hera.gnu - Fundamental tests were run
  • hera.intel - Fundamental and AQM WE2E tests were run
  • hercules.intel - Fundamental and AQM WE2E tests were run
  • jet.intel - Fundamental tests were run
  • orion.intel - Fundamental and AQM sample config (ush/config.aqm.yaml) were run
  • wcoss2.intel
  • NOAA Cloud (indicate which platform)
  • Jenkins
  • fundamental test suite
  • comprehensive tests

CHECKLIST

  • My code follows the style guidelines in the Contributor's Guide
  • I have performed a self-review of my own code using the Code Reviewer's Guide
  • My changes need updates to the documentation. I have made corresponding changes to the documentation
  • My changes do not require updates to the documentation (explain).
  • My changes generate no new warnings
  • New and existing tests pass with my changes

@MichaelLueken MichaelLueken mentioned this pull request Jun 25, 2024
Closed
@MichaelLueken
Copy link
Collaborator Author

@gspetro-NOAA -

I have updated the doc/ContribGuide/contributing.rst file to mirror the changes that I made to the PULL_REQUEST_TEMPLATE.

@MichaelLueken MichaelLueken added the run_we2e_jenkins_coverage_tests SRW App automated CI testing with modified Jenkinsfile label Jul 30, 2024
@MichaelLueken
[feature/hash_update] Removing the TASK_DEPTH axis entry from Jenkins…
55fb2ff 
…file. Replace env.SRW_WRAPPER_TASK_DEPTH with params.SRW_WRAPPER_TASK_DEPTH
@MichaelLueken MichaelLueken added run_we2e_jenkins_coverage_tests SRW App automated CI testing with modified Jenkinsfile and removed run_we2e_jenkins_coverage_tests SRW App automated CI testing with modified Jenkinsfile labels Jul 31, 2024
@MichaelLueken MichaelLueken removed the run_we2e_jenkins_coverage_tests SRW App automated CI testing with modified Jenkinsfile label Jul 31, 2024
@EdwardSnyder-NOAA
Copy link
Collaborator

The fundamental test passed on AWS:

Calculating core-hour usage and printing final summary
----------------------------------------------------------------------------------------------------
Experiment name                                                  | Status    | Core hours used
----------------------------------------------------------------------------------------------------
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta_2  COMPLETE             144.29
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2_20240  COMPLETE              22.37
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot  COMPLETE              89.85
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR_2024080  COMPLETE             308.78
grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0_20240808185  COMPLETE              91.16
grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16_2024080818583  COMPLETE             134.93
----------------------------------------------------------------------------------------------------
Total                                                              COMPLETE             791.38

Detailed summary written to /contrib/Edward.Snyder/pr-1096/expt_dirs/WE2E_summary_20240808214549.txt

In order to pass the plot we2e on AWS I had to update the modulefiles/tasks/noaacloud/plot_allvars.local.lua file to this:

load("conda")
setenv("SRW_GRAPHICS_ENV", "srw_graphics")

I thought I included this change in my PR-1091 that addressed PW build issues. Would it be possible to include updating the plotting lua file in this PR or do we need to make a new PR for this change?

@MichaelLueken
Copy link
Collaborator Author

@EdwardSnyder-NOAA -

Thanks for bringing this to my attention! I will go ahead and add this modification to the modulefiles/tasks/noaacloud/plot_allvars.local.lua file in this PR, I don't see a reason to create a completely different PR for this.

@MichaelLueken
Copy link
Collaborator Author

@EdwardSnyder-NOAA -

I have updated the modulefiles/tasks/noaacloud/plot_allvars.local.lua file. Please let me know if I need to make any other modifications. Thanks!

@EdwardSnyder-NOAA
Copy link
Collaborator

EdwardSnyder-NOAA commented Aug 9, 2024 •
edited
Loading

Changes look good! Thanks for including it. Approving.

@MichaelLueken MichaelLueken added the run_we2e_coverage_tests Run the coverage set of SRW end-to-end tests label Aug 9, 2024
@MichaelLueken
Copy link
Collaborator Author

All Jenkins tests successfully passed, with the exception of Jet, which were aborted for taking longer than 8 hours to complete.

The coverage WE2E tests were manually ran on Jet and all successfully passed:

----------------------------------------------------------------------------------------------------
Experiment name                                                  | Status    | Core hours used 
----------------------------------------------------------------------------------------------------
community_20240809205623                                           COMPLETE              24.31
custom_ESGgrid_20240809205625                                      COMPLETE              32.17
custom_ESGgrid_Great_Lakes_snow_8km_20240809205625                 COMPLETE              26.79
custom_GFDLgrid_20240809205627                                     COMPLETE              16.28
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018_202408  COMPLETE              13.18
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h_20  COMPLETE             100.43
get_from_HPSS_ics_RAP_lbcs_RAP_20240809205630                      COMPLETE              20.14
grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR_20240809205632  COMPLETE             639.58
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot_20  COMPLETE              73.89
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2_20240  COMPLETE               9.91
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta_2024  COMPLETE             974.37
----------------------------------------------------------------------------------------------------
Total                                                              COMPLETE            1931.05

Moving forward with merging this PR now.

@MichaelLueken MichaelLueken merged commit 7e8213f into ufs-community:develop Aug 12, 2024
5 checks passed
@MichaelLueken MichaelLueken deleted the feature/hash_update branch August 12, 2024 13:29
@MichaelLueken MichaelLueken mentioned this pull request Aug 12, 2024
Open
natalie-perlin pushed a commit to natalie-perlin/ufs-srweather-app that referenced this pull request Aug 15, 2024
@MichaelLueken
[develop] Update ufs-weather-model hash and further clean the machine…
cb2a713 
…s tested in PULL_REQUEST_TEMPLATE (ufs-community#1096)

* Update ufs-weather-model hash to b5a1976 (July 30)
* Add hera.gnu, remove cheyenne.intel, cheyenne.gnu, and gaeac5.intel, and alphabetize the machines in the TESTS CONDUCTED section of the PULL_REQUEST_TEMPLATE
* Correct behavior of Jenkins Functional WorkflowTaskTests. Currently, TASK_DEPTH is set to null, resulting in no tests being run during the Functional WorkflowTaskTests stage. Replaced env with params in Jenkinsfile for setting TASK_DEPTH. Testing shows that this will correctly set TASK_DEPTH to the default value of 9 and allow the tests to run
* Removed extraneous entries from the verification scripts to remove KeyError messages in the associated verification log files
* Reapplied necessary modification to modulefiles/tasks/noaacloud/plot_allvars.local.lua to allow plotting tasks to run on NOAA cloud platforms
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EdwardSnyder-NOAA EdwardSnyder-NOAA EdwardSnyder-NOAA approved these changes

@RatkoVasic-NOAA RatkoVasic-NOAA RatkoVasic-NOAA approved these changes

@mkavulich mkavulich Awaiting requested review from mkavulich mkavulich is a code owner

@gsketefian gsketefian Awaiting requested review from gsketefian gsketefian is a code owner

@JeffBeck-NOAA JeffBeck-NOAA Awaiting requested review from JeffBeck-NOAA JeffBeck-NOAA is a code owner

@BenjaminBlake-NOAA BenjaminBlake-NOAA Awaiting requested review from BenjaminBlake-NOAA BenjaminBlake-NOAA is a code owner

@ywangwof ywangwof Awaiting requested review from ywangwof ywangwof is a code owner

@chan-hoo chan-hoo Awaiting requested review from chan-hoo chan-hoo is a code owner

@panll panll Awaiting requested review from panll panll is a code owner

@christinaholtNOAA christinaholtNOAA Awaiting requested review from christinaholtNOAA christinaholtNOAA is a code owner

@christopherwharrop-noaa christopherwharrop-noaa Awaiting requested review from christopherwharrop-noaa christopherwharrop-noaa is a code owner

@danielabdi-noaa danielabdi-noaa Awaiting requested review from danielabdi-noaa danielabdi-noaa is a code owner

@mark-a-potts mark-a-potts Awaiting requested review from mark-a-potts mark-a-potts is a code owner

@jkbk2004 jkbk2004 Awaiting requested review from jkbk2004 jkbk2004 is a code owner

@willmayfield willmayfield Awaiting requested review from willmayfield willmayfield is a code owner

@dmwright526 dmwright526 Awaiting requested review from dmwright526 dmwright526 is a code owner

@gspetro-NOAA gspetro-NOAA Awaiting requested review from gspetro-NOAA gspetro-NOAA is a code owner

@natalie-perlin natalie-perlin Awaiting requested review from natalie-perlin natalie-perlin is a code owner

Assignees
No one assigned
Labels
run_we2e_coverage_tests Run the coverage set of SRW end-to-end tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MichaelLueken @EdwardSnyder-NOAA @RatkoVasic-NOAA